derp
added settings
added images and file upload
testing
Merge branch 'dev' of https://github.com/fhebert-perkins/helpdesk into dev