changes
Merge branch 'master' of https://github.com/joshleclash/Velosa

Conflicts:
	views/index.php
add changes for css