setup first test in rspec
Merge branch 'static-pages' of https://github.com/btwcnoob/sample_app into static-pages

Conflicts:
	spec/requests/static_pages_spec.rb
Merge branch 'master' into static-pages
mostly static pages

did a little actual programming
Merge branch 'static-pages' of https://github.com/btwcnoob/sample_app into static-pages

Conflicts:
	spec/requests/static_pages_spec.rb
Merge branch 'static-pages'