Meeting Changes 11-30

Implemented all of the changes discussed in the meeting on 11-30.
Merge pull request #5 from Armadillus/Armadillus-master

Meeting Changes 11-30