Code for stories 7 and 9 added: Drawing with circular and square drawing tools. Circular tool doesn't work right yet.
Merge conflicts solved in Fingerpaint.java and fingerpaint.css
Merge branch 'master' of https://github.com/Fingerpaint/project-code