Base project for start of the pull request lab
Removing some misc artifacts of the solution from the project base
Added content to README.rdoc
Adding a copy of the database so project is prepopulated
Added .active scopes to proverbs and photos controllers
Making the project (mostly) compatible with Rails 4
Merge branch 'master' of github.com:jkcorrea/jkcorrea_world

Conflicts:
	.gitignore