Hot-N-Seek/capstone — pull request #4 by cameronholland90 (2014-04-09 19:43:38+00:00)
Title: Ivan

fixed conflict