Weird commit errors hopefully fixed
Merge branch 'master' of https://github.com/cbranch101/tornado_twins_entry