Basic Edits

Update (will add description in a minute)
Merge branch 'views' of https://github.com/PulledPork/write into views

Conflicts:
	db/development.sqlite3