minor chnages
fix conflict
Merge branch 'dev' of https://github.com/Itay289/Kick-It into dev
added gem 'yajl'