terminal test
Merge branch 'master' of https://github.com/tomasro27/TimeCapsule
terminal testt