Merge branches 'master' and 'dev'
Added licensing information
folder rename
Changed name of folder
Getting rid of eclipse cruft, if anyone wants to work on this in Eclipse, just create a new project in the same directory as this code, using the exact same name, and then it'll just take up the code from this project
Merge branches 'dev' and 'master' into dev