* Removed some stuff on MDKs computer
Merge branch 'master' of github.com:hak-man/govhack2013

Conflicts:
	ui/index.html
* Added /video redirect (to rickroll)