merge
eclipse settings conflict
merged conflicts
Merge branch 'master' of https://github.com/trickyil2000/unicorn_mkbid.git