revert
Merge branch 'master' of github.com:beast/appdevinc

Conflicts:
	test.txt