added user_mailer copy for html and text
added in copy for the ramble creation email views
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
did some code cleanup on application.html.erb
Changed reddit section of discovers page to display list of subreddits related to specified destination.
made subreddit names links and styled the section a bit
API links on discovers page now open in a new tab
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/layouts/application.html.erb
added pages controller, created about page, adjust routes and nav menu, started filling it in with content.
added additional content to about team page, including photos of all team members
made team members a list on about page
Merge pull request #86 from dheckman/master

style to ramble page, still need to create dropdown on title click
added font awesome icons to about page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/assets/stylesheets/discovers.css.scss
	app/views/discovers/show.html.erb
Merge pull request #87 from gregburton/master

Numerous changes to API behavior on discover page, created about page and added content, added and adjusted user_mailer and ramble_mailer copy
note styling seems to work on create now
minor modifications to about and user show pages
changed some formatting on user profile page, did code cleanup on users.css.scss
placeholder image feature now working on user profile page
show/hide working for 3/4 api's