My commit message
Merge branch 'master' of https://github.com/RadioLemon/james_loves_brocolli
Fixed merge conflicts
Conflicts:
	james_loves_brocolli_netbeans/src/bropals/JamesLovesBrocolli.java