Database code is now working for adding a custom users
Merge branch 'master' of github.com:InversePandas/Fire

Conflicts:
	Fire/Base.lproj/Main.storyboard