done
Merge branch 'master' of https://github.com/chatnuere/whatTheFete

# By chatnuere
# Via chatnuere
* 'master' of https://github.com/chatnuere/whatTheFete:
  add users

Conflicts:
	What The Fête/Base.lproj/Main.storyboard
FINAL