gitignore
fiksa litt paa gitignore
Merge branch 'master' of https://github.com/nicolayh/academy

Conflicts:
	log/development.log