Generate scaffold files and use sqlite3 for database
Add root to routes.rb and add ckeditor and paperclip in Gemfile
Add CKEditor
Merge branch 'p2'

Conflicts:
	Gemfile.lock