Merge branch 'master' of https://github.com/phlip9/calnected

Conflicts:
templates/index.html
requires merging

index.html
index2

requires merging
Merge branch 'master' of https://github.com/phlip9/calnected
Revert 64c1b5a..fcfe746

This rolls back to commit 64c1b5a0cebac4a7807cf74569035dd054961380.