Merge branch 'master' of https://github.com/ngrieble/analyzer

Conflicts:
	app/views/welcome/index.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/welcome/index.html.erb
Merge Fixes