Rewrite on Tests
Additional testing added
Matt's refactor
Test rewrite for new refactored code
8 passeded tests
10 passing tests
Merge branch 'testing'

Conflicts:
	app/scripts/main.js
	test/spec/test.js