Refactored
Merge branch 'master' of github.com:stephenrichter/reflection

Conflicts:
	css/style.css