AM

AM:
- problems in repo, temporary changes
Debugging...

debugging
Merge branch 'master' of https://github.com/pamiko/tgm_2014_15