Merge pull request #1 from ericvangelder/master

Added build.xml file from Thing42 with options for pack & deploy under target "dist"
Merge pull request #2 from ericvangelder/master

Added ant-javafx.jar for javafx ant task defs
adding Javadocs and update code with checkstyle fix
checkstyle and javadocs added
adding authors' names
working commit for save
Update ButtonController.java
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 pull request #3 from kiemtech/patch-1

Update ButtonController.java
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