"Updated test; added link to Home on header"
"Fixed Merges"Merge branch 'master' of https://github.com/camcross/rafiki

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb
Finished testing algorithm; user can complete a test and get a score