Some unwanted commit
Merge branch 'master' of https://github.com/malikba/angular-express-gallery

Conflicts:
	appFrontEnd/views/jade/index.jade