Homework 4

- Fixed unit tests and updated with angular
- Basic JSON text area UI
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	gameLogic.js
	gameLogic_test.js