random fixes
Merge branch 'master' of https://github.com/jimmyhsu/HAB-Challenge

Conflicts:
	hab_reports/www/templates/createreport.html