App built
Merge branch 'master' of https://github.com/aldrinalmacin/jba

Conflicts:
	.gitignore