new changes
Merge branch 'master' of https://github.com/petersirka/codecon

Conflicts:
	databases/online.cache
	public/js/default.js
	views/homepage.html