pulling master
Changes for responseive design for tablet
Merge branch 'master' of https://github.com/jj-macks/along-the-way into refactor

Conflicts:
	css/index.css
Merge branch 'master' of https://github.com/jj-macks/along-the-way into refactor