added some stuff, broke some stuff
fixed conflict
Merge branch 'master' of https://github.com/alexstelea/Fighting-Mongooses
Merge branch 'master' of https://github.com/alexstelea/Fighting-Mongooses
Merge branch 'master' of https://github.com/alexstelea/Fighting-Mongooses
added junit test
Merge branch 'master' of https://github.com/alexstelea/Fighting-Mongooses