edit views
adit views
Merge branch 'master' of github.com:Lawliet-L/smartphone

Conflicts:
	views/index.ejs