Changes some stuff

More parsing fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp
	main.exe
Merge branch 'master' of https://github.com/Enraric/Fraction_Program

Conflicts:
	main.cpp