initial commit
Merge branch 'master' of github.com:lukeshaughnessy/first_app

Conflicts:
	Rakefile
	config/initializers/session_store.rb