Better version of the App
Merge branch 'master' of github.com:oblodgett/BAC

Conflicts:
	src/main/java/net/nilosplace/BAC/App.java