stuff by alex
Merge remote-tracking branch 'origin/master'
asdfas
Merge remote-tracking branch 'origin/master'
started timer
adf
Merge branch 'master' of https://github.com/camwiese/tictalk
remove unneeded files from git
Merge branch 'master' of https://github.com/camwiese/tictalk