first commit
Merge branch 'Daniel' of https://github.com/YAMproductions/sirtet