v 0.6.9
Merge branch 'master' of https://github.com/2UP/YC

Conflicts:
	css/style.css
	system/application/views/main.php