-picture upload, some ather small tweaks
small update to colour editing
bower.json
return to colour button
Merge branch 'master' of 54.194.43.118:/home/aria/FrameItIn
file name functionality for uploads and downloads
Cancel button in file name input
Small download button