logic
Merge branch 'master' of https://github.com/danielhusar/portfolio

Conflicts:
	app.js
	app/helpers/helpers.js
	config/routes.js