added a bunch of stuff
Merge pull request #2 from alexjaco/alexPrac3

added a bunch of stuff