added markdown gem and added docs route
Merge branch 'dev'
fixed rubocop issues
merged dev
added capybara
Merge branch 'master' into dev

merged master
added capybara-webkit