Minor changes
Error Handler Added
Merge branch 'ErrorHandler' into marius
Merge pull request #2 from tavaron/patrick

Patrick
Controller, Callback-Timer and first parts of GUI added
Merge pull request #3 from tavaron/marius

Marius
Nearly compiled :)
fixed syntx error
after using merge tool
conflicts