Merge branch 'master' of https://github.com/present1117/PLTProject

Conflicts:
PLTImplementation/src/Functions.java
Merge branch 'master' of https://github.com/present1117/PLTProject

Conflicts:
	PLTImplementation/src/Functions.java