redo initial commit
replaced README
try again, update rspec
static pages ...
"static pages ..."
Merge https://github.com/bstenger/ResearchMachine

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	config/initializers/secret_token.rb
	config/routes.rb