Started frame
Started on frame
Added frame, cap to chairs

Conflicts:
	projects/project_2/src/FerrisWheelCanvas.java