merged github
changed shit to stuff