#20 version.txt added and displayed home page
Merge branch 'develop' of github.com:railsrumble/r13-team-357 into develop

Conflicts:
	app/views/layouts/welcome.html.haml
Merge branch 'develop' of github.com:railsrumble/r13-team-357 into develop