initial commit
merged
Merge branch 'master' of https://github.com/mgingras/fbomb

Conflicts:
	.gitignore