Merge pull request #12 from BOFHers/master

Reset to HEAD instead of origin/master, also start making a Makefile
Merge pull request #13 from BOFHers/master

Revert "Reset to HEAD better"
Merge pull request #14 from BOFHers/master

Stop crashing randomly
Merge branch 'master' of github.com:olipo186/Github-Gitlab-Auto-Deploy