Updated with Lions
Merge branch 'master' of https://github.com/MBRU-/LionsAndTigers

Conflicts:
	LionsAndTigers/Base.lproj/Main.storyboard
	LionsAndTigers/ViewController.swift