Merge branch 'master' of https://github.com/sierrakn/247finalproject
Beginning of drawing program
Fixed merge conflicts