Talk 7 pretty much done
Merge branch 'master' of https://github.com/jgensler8/SIG-App