Fixed CSS merge conflict and removed some unnecessary files
Merge remote-tracking branch 'root/master'
WIP testing, targetsCreate attaches user_id to model
target tests working
Hooked up create run target page and fixed styling
Fixed merge conflicts
WIP runEvent api tests
merge conflict fix targetsCreateController
Fixed issues with creating run targets
Merged with test changes and fixed broken code
event API tests done, except time format issue
gemnasium hookup
fix merge conflict in api/routes/runTargets.js
fixed event tests
gemnasium badge
Converted templates to hbs files
html update
Merge branch 'master' of https://github.com/CooperAtive/goalkeeper

Conflicts:
	index.html
	public/css/index.css
	public/css/login.css