Finished all the neccessities for the Peer Assignment 1, might pretty it up later, but it has everything it needs right now
Merge branch 'old-master'