made some controllers
Merge branch 'master' of https://github.com/robert-king/kiwiflag

Conflicts:
	kf-cli/app/index.html
	kf-cli/app/scripts/controllers/uploadflag.js
	kf-cli/app/views/upload.html