trying to get markdown preview working
installed markdown preview
removing files
Merge branch 'markdown-live'

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/wikis/edit.html.erb
	app/views/wikis/show.html.erb
redcarpet plus some markdown preview