Merge pull request #92 from n8ebel/dev

Pulls dev into master
Merge pull request #94 from n8ebel/dev

Pulls dev into master to close documentation of gui code
#56 Finished documenting Resource classes