initial commit for dojo6
commit message
Merge branch 'master' of heroku.com:hackeracademy2011

Conflicts:
	app/helpers/contests_helper.rb