- added font
- added player controls
Merge branch 'master' of https://github.com/fishtopher/GameJam2014

Conflicts:
	Assets/Scripts/Game/Player.cs
	Assets/Scripts/Player.cs