Initial, nonworking commit
Merge github.com:ivanrodriguez5/jpaint

Merging stuff