Import source code
Merge branch 'master' of heroku.com:eivind

Conflicts:
	client/templates/home.html
added gitignore