ui
Merge branch 'master' of https://github.com/SamSamskies/PCOI

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