5/10
Merge branch 'master' of https://github.com/okpala/IC-Bar-Buddy--Alpha-

Conflicts:
	IC Bar Buddy/BarInfoViewController.m
5/10