Finished Project 2

@bronhunston
#7
#8

~requested: 600 points