mmmmmmmmmmmmmmmmmhhhhhhhhhh
Merge pull request #26 from IRelaxxx/Gustav-Dev

Gustav dev
Updated Buttons
Merge pull request #27 from IRelaxxx/Alex-Dev

Alex dev