updating 8505 a2
updating 8505 a2
Merge branch 'master' of https://github.com/kotowick/Term7

merging stuff