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

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
Remove unnecessary menu