more bootstrap stuff
wat da hell is gongin on>!?!

Merge branch 'master' of https://github.com/Rubbishman/rivl

Conflicts:
	application/views/index.php
	css/main.css