#2
#3
Merge branch 'master' of https://github.com/Ruub020/Alcohol-App

Conflicts:
	MID/MID/Base.lproj/iOS7-4inch.storyboard
	MID/MID/ViewController.h
	MID/MID/ViewController.m