Enhance input parser to take in form from Xpm/am to Ypm/am
Merge branch 'master' of https://github.com/cs2103aug2014-w10-4j/main