began position styling on About Us page
Merging with live rendering and text editor functionality
Merge branch 'master' of github.com:jeffthestampede/cssdash

* 'master' of github.com:jeffthestampede/cssdash:
  added js and css for live rendering index home
  added live rendering to home index page
  Re-add tag_list to index and content show pages

l be ignored, and an empty message aborts
styled About Us page with Wooj's stand-in image
Merge pull request #16 from miclowe/master

Gravatar image and tags on user profile page
added contents new styling
users show html added
add svgs
remove .DS_store
add editarea gem to make css and html input full txt editors with syntax highlighting and etc
removed the formatted editor and edit area gem because it was breaking live rendering
Added an endpoint for each content item. Populating iframes for pages page by pointing them to this endpoint.
Javascript added for mouseover card_description on homepage
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  removed the formatted editor and edit area gem because it was breaking live rendering
  add editarea gem to make css and html input full txt editors with syntax highlighting and etc
  remove .DS_store
  add svgs
  users show html added
  added contents new styling
  Completed Gravatar image link and corrected tags on user profile page
  added search results page with live render as well as live render for content details

Conflicts:
	app/assets/stylesheets/contents.css.scss
	app/views/contents/new.html.erb
	app/views/pages/index.html.erb
	app/views/users/show.html.erb
Merge pull request #20 from livienyin/master

Styling for homepage and refactored live rendering to server side.
Added password recovery email functionality