Committing for merge.
Start of follow set
Merge branch 'master' of https://github.com/teampumpinglemma/3240-teamplemma

Conflicts:
	Java1.7.0_15Code/src/LL1ParsingTable.java
	Java1.7.0_15Code/src/Main.java
Merge branch 'master' of https://github.com/teampumpinglemma/3240-teamplemma