syncing mac
Merge branch 'master' of https://github.com/wsharp07/mean-app

Conflicts:
	.idea/workspace.xml
	app/includes/layout.jade
	app/includes/scripts.jade
	app/views/index.jade