First commit
Merge branch 'master' of github.com:diedu89/heimdal-project
Merge of the current files and github repository