attempt to fix the constraint issues
Merge branch 'master' of https://github.com/eibakke/drinking-app

Conflicts:
	MainStoryboard.storyboard

Should be merged now
merged?