Layout

Bootstrap and dependency files
Merge branch 'master' into Tej_branch

Conflicts:
	views/index.ejs