Milestone 3 finished

All the goals for milestone 3 were implemented