stuff
weewa
Merge branch 'andreas' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
work
updated gitignore