first checkin
Merge branch 'master' of https://github.com/noisybit/ksp-report

Conflicts:
	app/scripts/controllers/main.js
	app/views/main.html