Merge remote-tracking branch 'origin/master'

 Conflicts:
	guider.mdwn
	konfigurationer.mdwn
	träffar.mdwn

This was part in a cleaning up session

diff --cc guider.mdwn
index 743fc23dd7e7af245984f8f743153090f42c8da7,16f20b655fdbe7ecbd24f538a3baf141f46ba82f..3674ebc0d14bcd3b284a8c769626bc423e12de29
--- 1/guider.mdwn
--- 2/guider.mdwn
+++ b/guider.mdwn
@@@ -134,8 -87,7 +134,7 @@@ Note these tools are built and ready [a
      #./cbfstool yourrom.rom remove background.png -n background.png
      #./cbfstool yourrom.rom add -f background.png -n background.png -t raw
  
 -    sudo ./flash update libreboot.rom
 +    sudo ./flashrom -p internal -w libreboot.rom #updated image
- 
      
  
  ###KGPE-D16
@@@ -245,48 -182,8 +240,48 @@@ ROM-chip (eg.): Winbond W25Q16DV (if RO
      # In my case (KGPE-D16) it was very difficult - seemingly at random - to achieve a configuration such as read and write had good reliability.
      # Furthermore, writing had good success rate while reading was more error prone.
      # Thus, it is possible to write to the ROM and read (e.g.) 10 times and compare the resulting `sha512sum` to that of the ROM downloaded from Libreboot.
-     # If the sum EXACTLY matches atleast once, it is reasonable to assume that the write indeed succeeded.
+     # If the sum EXACTLY matches atleast once, it is reasonable to assume that the write indeed succeeded (we believe).
  
 +## Extend 2MB ROM to 8MB
 +
 +### Here is the script we use to flash 8mb chip
 +
 +```
 +root@beaglebone:~# cat flashme_8mb.sh 
 +echo 'Creating a 8mb Libreboot Rom'
 +echo 'creating the file /home/flashing_d16/libreSept16/8mb_free.rom'
 +echo 'dd ing'
 +touch /home/flashing_d16/libreSept16/8mb_free.rom
 +echo ' ' > /home/flashing_d16/libreSept16/8mb_free.rom
 +echo 'Zeros then image'
 +dd if=/dev/zero bs=6144k count=1 of=/home/flashing_d16/libreSept16/8mb_free.rom
 +echo 'Writing image'
 +dd if=/home/flashing_d16/libreSept16/libreboot_r20160907_grub_kgpe-d16/kgpe-d16_svenska_txtmode.rom >> /home/flashing_d16/libreSept16/8mb_free.rom 
 +ls -lah /home/flashing_d16/libreSept16/8mb_free.rom  
 +echo 'Its flashing time'
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=2048 -w /home/flashing_d16/libreSept16/8mb_free.rom
 +echo 'everything is done'
 +echo 'plz verify'
 +echo '
 +cd directory-with-size
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=1024 -r factory3.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=1024 -r factory4.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=1024 -r factory5.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=256 -r factory6.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=256 -r factory7.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=256 -r factory8.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=2048 -r factory9.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=2048 -r factory10.rom
 +/home/flashing_d16/libreSept16/libreboot_r20160907_util/flashrom/armv7l/flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=2048 -r factory11.rom
 +sha512sum factory*.rom
 +'
 +
 +```
 +
 +
  ##Coreboot
  
  ##Fria wifi

diff --cc index.mdwn
Simple merge

diff --cc konfigurationer.mdwn
index 5e9617ebc05113c17402284f48e18b68ad24694a,27188d3476b34c5d78d816fe9aa29aa6f7a4d0de..dcebd636e54b025667e56455caeddf6955b33ccc
--- 1/konfigurationer.mdwn
--- 2/konfigurationer.mdwn
+++ b/konfigurationer.mdwn
@@@ -5,25 -5,21 +5,25 @@@ Här samlar vi olika konfigurationer
  Nedan följer en lista över hårdvara som Inbyggd frihets medlemmar innehar.
  
   1. Bärbara datorer
 -     * Chromebook C201
 -     * Macbook2,1
 -     * T60
 -     * X60
 -     * X200
 -     * X220
 -     * X230
 +     * **Chromebook C201**
 +     * **Macbook2,1** - Libreboot
 +     * **T60** - Libreboot
 +     * **X60** - Libreboot
 +     * **X200** - Libreboot
 +     * **X220** - Coreboot
 +     * **X230** - Coreboot
 +
  
   2. Stationära datorer
 -     * KGPE-D16
 -  
 +     * [**KGPE-D16**](../guider/#inde7h3) - Libreboot
 +
 +
   3. Enkortsdatorer
 -     * A20-OLinuXino-LIME2
 -     * BeagleBone Black Rev C
++
 +     * **A20-OLinuXino-LIME2**
 +     * **BeagleBone Black**
 +     * **GnuBee Personal Cloud 1**
  
- 
   4. Mobiltelefoner
 -     * I9100 (Galaxy S2)
 -     * I9300 (Galaxy S3)
 +     * **I9100 (Galaxy S2)** - Replicant
 +     * **I9300 (Galaxy S3)** - Replicant

diff --cc träffar.mdwn
index 44cfaa6c7d46450de2f836b37de2426395abae37,c1a7fed8d112e825cf1ecd3a0119d1cba94bb333..cfa72e8727860fc59f46a7f575a0ceeaaf3fd970
--- 1/träffar.mdwn
--- 2/träffar.mdwn
+++ b/träffar.mdwn
@@@ -1,29 -1,11 +1,31 @@@
  #Tidigare träffar
 -* **17/2 -18** |  11:00 - 24:00 |  Chalmers NC  |  Närvarande: 3 
 +
++
 +* **10/11 -18** | 12:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 3
 +* **13/10 -18** | 12:00 - 18:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 4
 +* **15/9 -18** | 11:00 - 17:00 | Viktoriahuset (Digidems lokaler) | [Fripost migrera från Google](https://wiki.fripost.org/aktivitetsdagar/#index1h3)
 +* **2/9 -18** | 10:00 - 19:00 | Viktoriahuset (Digidems lokaler) | [Digidem hackaton](http://civictechgbg.se/hackathon-2/)
 +* **1/9 -18** | 11:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 2
 +* **18/8 -18** | 11:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 3
 +* **4/8 -18** | 11:00 - 19:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 4
 +* **21/7 -18** | 11:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 3
 +* **7/7 -18** | 11:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 2
 +* **23/6 -18** | 13:00 - 20:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 2
 +* **16/6 -18** | 10:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 3
 +* **26/5 -18** | 10:00 - 02:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 4
 +* **12/5 -18** | 10:00 - 19:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 3
 +* **28/4 -18** | 10:00 - 16:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 4
 +* **21/4 -18** | 11:00 - 18:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 1
 +* **31/3 -18** | 10:00 - 17:00 | Viktoriahuset (Digidems lokaler) | Närvarande: 3
 +* **10/3 -18** |  10:00-19:00  | [Digidem hackaton](http://civictechgbg.se/hackathon-1/)
 +* **3/3 -18** |  11:00 - 19:00 |  Chalmers NC  |  Närvarande: 2
 +* **17/2 -18** |  11:00 - 24:00 |  Chalmers NC  |  Närvarande: 3
  * **3/2 -18** |  11:00 - 23:00  |  Chalmers NC  |  Närvarande: 2 
  * **20/1 -18** |  11:00 - 16:00 |  Chalmers NC  |  Närvarande: 2 
 -* **10/11 -17** |  17:00 - 02:00 |  Chalmers NC  |  Närvarande: 3 
 +* **10/11 -17** |  17:00 - sent |  Chalmers NC  |  Närvarande: 3 
- |
+ 
  
  #Kommande träffar
 -* **3/3 -18** |  11:00  |
 -* **10/3 -18** |  10:00-19:00  | [Digidem hackaton](http://civictechgbg.se/hackathon-1/)
 -* **17/3 -18** | 11:00 |
 +
 +*(Udda lördagar)*
++k