fixed errors.
Merge branch 'master' of https://github.com/PieDestroyer/SISproject.git
Almost done.