FUNCTIONAL CODE
now with MORE functionality
Final HW from last night and folders for today
Fix conflicts
Merge pull request #131 from ScottyGams/master

Merging to my fork