Initial commit
Merge branch 'master' of https://github.com/DeathTheFreaky/Boa.git

Conflicts:
	README.md
Merge branch 'Clemens'