Project 1 submission

#3 for 50 points
#6 for 300 points
#4 for 300 points 
@jstaahl