Merge pull request #4 from tabosque/develop

Modified Gemfile
Merge pull request #8 from tabosque/develop

Merge develop
Add static pages
Merge branch 'static-pages'
Finish static pages
Merge pull request #11 from tabosque/little-bit-dynamic-pages

Little bit dynamic pages
Merge branch 'master' of https://github.com/tabosque/sample_app

Conflicts:
	Gemfile.lock
	app/views/static_pages/about.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	spec/requests/static_pages_spec.rb
fixed static pages
Merge pull request #12 from tabosque/3-5

3 5