Quick summary of what changes

- change 1
- change 2
Merge branch 'Soham' of https://github.com/guppyfish/YRS2013 into emma/railsexperiment
Adds rudimentary homepage in views\welcome\index.html.erb
adds <p> QUESTION </p>
adds VERY basic structure, needs bootstrap adding
removes some divs
adds bootstrap
Merge branch 'emma/railsexperiment'

Conflicts:
	config/routes.rb