Merge branch 'Update'
Merge branch 'master' into George-Mason
Restricted file upload types added.
Random Text
Merge branch 'George-Mason'
Merge branch 'master' of https://github.com/jpyoung/UML_Gen
Merge branch 'master' into Update
changed working settings