damn I feel like a ganster, haven't updated in a while
Merge branch 'master' of github.com:fsk141/scripts