Fixed merge issues
Merge branch 'master' of github.com:bponnaluri/javaplayland