working commit for save
Merge branch 'master' of https://github.com/Kimmsudenver/ImageViewer
into save

Conflicts:
	bin/controller/Main.class
	src/controller/ButtonController.java
finished save for images and text. Added JUnit libs to lib folder.
save and save tests are done
added doc, and build to .gitignore
Merge branch 'master' of https://github.com/Kimmsudenver/ImageViewer

Conflicts:
	src/controller/ButtonController.java
merged save text with save image commits
Merge pull request #4 from guygrigsby/master

Save for both text and images