Added links to views
changed log messages
Merge branch 'put_verb'

Conflicts:
	views/index.jade
commit again from laptop