devel log
Merge branch 'master' of github.com:OwenRackham/idid_ascience

Conflicts:
	log/development.log