merge
Merge branch 'master' of github.com:Eraden/git_view

Conflicts:
	app/views/imports/commit.jade
	app/views/imports/main_menu.jade