paper compile
changed all the stuff to get ready for will's code
Merge branch 'master' of github.com:teddyknox/HAM
lots of things done
almost forgot