Merge pull request #2 from bushwack/master

Added some basic front-end features. (See commit log). Should merge automatically! No need to interface my changes with anything.
Added line draw, free draw tools and save button and their respective functions
Merge pull request #3 from deemz0/master

Added line draw, free draw tools and save button and their respective fu...
Resolved merge conflicts.