home
Merge branch 'master' of https://github.com/ane1990/Linneo

Conflicts:
	log/development.log
log