alright that Shake.js didn't work out
Merge branch 'master' of github.com:founddrama/dev-dice

stubbing 0.1.2

  - adds "Java Swing" as a UI option
  - update to Angular 1.0.8
  - adds angular-mocks
  - add Karma + tests
  - misc. clean-up

Conflicts:
	package.json
	static/javascripts/controllers.js