Init commit
Merge branch 'master' of github.com:MMAUG/BF101

Conflicts:
	.gitignore