-added file
Merge branch 'master' of https://github.com/samuelmolinski/fuzzy-octo-hipster
Merge branch 'master' of https://github.com/samuelmolinski/fuzzy-octo-hipster
- removed the time out feature of the combination page