12
Merge remote-tracking branch 'origin/master' into AP1

Conflicts:
	test.txt
12
Merge pull request #8 from NeoTech/AP1

12
Merge remote-tracking branch 'origin/master' into hillbillybranch

Conflicts:
	test.txt
Andreas fipplar.