changed VoteCtrl up a bit, adding some hardcoded objects
Merge branch 'jon' of https://github.com/nevilgeorge/ladel
templating working correctly
templating working with new view
installing ng-file-upload
fixing merge commits
icon change
added correct file type for image upload