1
Merge branch 'master' of https://github.com/NikoGenn/byWay

Conflicts:
	byWay/Base.lproj/Main.storyboard