Big update for huge bug.
Merge branch 'master' of https://github.com/esolis1/FirstProj

Conflicts:
	readme