:(
Merge branch 'master' of https://github.com/Ruub020/Alcohol-App

Conflicts:
	NewDirectory/MID2/MID/iOS7-4inch.storyboard