Some work done on the front-end upload
Merge branch 'master' of https://github.com/alucardu/skittles into upload