Merge branches 'master' and 'brandons' of github.com:BrandonIngalls/Tech...

...HacksII into brandons