fixed null pointer
Merge branch 'master' of github.com:MosNicholas/fb_hackathon