CodeRIT.org Version 2
Merge branch 'dev-nate'

Conflicts:
	_includes/head.html
	assets/images/icon.png