i updated stuff
Merging
Merge branch 'master' of https://github.com/PhoenixRockit/Team-Synergy-Team