added some views
Merge branch 'master' of https://github.com/lsiu/tails-server

Conflicts:
	server.js