Create Viewer
Merge branch 'master' of https://github.com/jackmacattack/gamejam2014

Conflicts:
	gamejam2014/src/edu/virginia/cs/sgd/game/model/Model.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamejam2014/ModelData.txt
	gamejam2014/src/edu/virginia/cs/sgd/game/model/Character.java
Merge branch 'master' of
https://github.com/jackmacattack/gamejam2014.git

Conflicts:
	gamejam2014/src/edu/virginia/cs/sgd/Program.java
	gamejam2014/src/edu/virginia/cs/sgd/game/Level.java
	gamejam2014/src/edu/virginia/cs/sgd/screen/TestScreen.java