-validation for downloading and uploading
- added button for uploading edited picture
resolved conflicts
change to scrollbar
Merge branch 'master' of 54.194.43.118:/home/aria/FrameItIn
deployment
small camera indicator
scrollbar styling
Merge branch 'master' of 54.194.43.118:/home/aria/FrameItIn
adding jasmine tests
camera button and some other minor updates
playing with angular
-mypics
-public pics
-and other updates
fix to link in public and mypic pages
added more unit tests and small layout changes
modification to themes.js
some fixes
small fixes for layout
w3c validation
added an extra test for changing themes
merge