edit to index.html and default/index
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal

Conflicts:
	controllers/default.py
	views/default/index.html