Improve the README
Initial commit
Add a StaticPages controller
Finish static pages
Initial commit
Merge branch 'master' of git://github.com/ni3t/sample_app_2 into HEAD
Merge branch 'master' into HEAD
Merge branch 'master' of heroku.com:vast-everglades-3243 into HEAD

Conflicts:
	.DS_Store
	app/.DS_Store
	app/controllers/static_pages_controller.rb
	app/views/.DS_Store
	app/views/layouts/application.html.erb
	app/views/static_pages/about.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb
Initial Commit
Merge branch 'master' of https://github.com/ni3t/sample_app into HEAD

Conflicts:
	README.md
Finish sign-in