Updated a lot of shit

Yeah (Y)
Merge branch 'master' of https://github.com/shelbymorris90/logotrek