Adds most of project 2

This includes everything from project 2 except the debugging and the cvs
part.