16-06-2014 1556
Merge branch 'master' of https://github.com/wpawgasa/InterBallistic_v0.1

Conflicts:
	build/classes/dti/internalballistics/MainWindow.class
	src/dti/internalballistics/MainWindow.java