MyParser.java changes that weren't commited before
Resolved conflicts with files.
Merge branch 'master' of https://github.com/spencerbrett/web-apps

The merge conlficts in MyParser.java were fixed.
Merge branch 'master' of https://github.com/spencerbrett/web-apps