new with backend
Merge branch 'master' of https://github.com/stoeffel/lan-camp
rm
init
more
registration
removes pwd
json
Merge branch 'master' of https://github.com/stoeffel/lan-camp

Conflicts:
	app/scripts/controllers/register.js
	backend/app.js
	backend/package.json
	frontend/.tmp/concat/styles/vendor.css
	frontend/.tmp/styles/main.css
	frontend/app/scripts/controllers/confirmationPending.js
	frontend/app/scripts/controllers/register.js
	frontend/app/views/about.html
	frontend/app/views/contact.html
	frontend/app/views/main.html
	frontend/app/views/register.html
	frontend/dist/index.html
	frontend/dist/views/about.html
	frontend/dist/views/contact.html
	frontend/dist/views/main.html
	frontend/dist/views/register.html