Initial Commit
Merge branch 'static_pages'

Conflicts:
	config/database.yml