Merge branch 'master' into mitch
content button and route

created content added learn more button and route to about page
added about content, button, route to about page
merged

anch 'master' into mitch

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #26 from TandasCodeup/travis

Small Changes
Merge branch 'master' into Jaime
Merged with master

 and added a Dashboard link to homepage for logged users
Corrected tanda view name
Merge branch 'mitch'

	app/views/about.blade.php
	app/views/home.blade.php
	public/assets/css/tandas.css
Merge branch 'master' into mitch

Conflicts:
	app/views/about.blade.php
	app/views/home.blade.php
	public/assets/css/tandas.css
Merge pull request #27 from TandasCodeup/Jaime

Jaime
Merge branch 'master' into mitch
Merge pull request #28 from TandasCodeup/mitch

Mitch
Created edit page
Password Reset almost complete
merged

anch 'master' into travis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.