log
Merge branch 'master' of https://github.com/hillis/simple_cms

Conflicts:
	log/development.log
	simple_cms_development.sql