did some refactoring
Merge branch 'new' of https://github.com/rubytribe/rubytribe_landing into new