index fun time
Lassie
CSS Fix
Index CSS
Merge branch 'lassie'

Resolved Conflicts:
	views/index.html
Merge branch 'master' of https://github.com/Molitov/collab-edit