Stashing changes for now
Fixed merge?
Merge branch 'master' of https://github.com/FJSingel/Tinfoil-Chat
Added starting Chat code?