Merging my files
Merge branch 'master' of https://github.com/doctorOb/tickr