static files working now
fixed conflict
uploader page
Merge branch 'master' of github.com:nikhilaravi/ingeniousinstruments