Create wiki spec and resources and more gems
Main wiki page renders, in HAML and bootstrap
Added Create a Wiki form with private checkbox
Added faker, database_cleaner, and wiki seed data
Wikis display and create form working
Made form a bit better looking
Added ability to update a wiki
Put edit into a _form partial, commented non-working feature
Merge branch 'master' into more-features

Conflicts:
	app/controllers/wikis_controller.rb
	app/models/user.rb
	app/models/wiki.rb
	app/views/wikis/_form.html.haml
	app/views/wikis/index.html.haml
	app/views/wikis/show.html.haml
	app/views/wikis/update.html.haml
	config/routes.rb
Merge pull request #3 from michellebonat/more-features

Added ability to update a wiki