Screen resolution
Merge branch 'master' of https://github.com/TeamFallingBacon/proj

Conflicts:
	Falling_down/Assets/level1.unity
Merge branch 'master' of https://github.com/TeamFallingBacon/proj