added parser functions
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev

Conflicts:
	JComparser/src/Parser.java
added parser functions