Merge branch 'master' of github.com:luminusxp/ifbba

Conflicts:
	.gitignore
Merge branch 'master' of github.com:luminusxp/ifbba