Update .gitignore
Update project

Seems like the branch merge didn’t work
Update again
Add config.gypi
DS_Store update
Merge branch 'master' of https://github.com/bergenhem/bodyfat-app

Conflicts:
	.DS_Store
	public/.DS_Store
	public/scripts/.DS_Store
	public/styles/.DS_Store