random shit for index page
Merge branch 'master' of https://github.com/johnsone2/rox-proposals

Conflicts:
	index.html