before pul
Merge branch 'master' of github.com:Hoverbear/SPARCS
Merge branch 'master' of github.com:Hoverbear/SPARCS
working...ish
Merge branch 'master' of github.com:Hoverbear/SPARCS
stuff
finished...i think