merge attempt (got help me)
merge
gitignore add
Merge branch 'master' of https://github.com/seavor/fatapp

Conflicts:
	.gitignore