update
Merge branch 'master' of https://github.com/sebringj/silipint

Conflicts:
	www.silipint.com/public/css/main.css