Project 3

Merged changes to Project 3 to master