Edits 18th August 13
Merge branch 'master' of github.com:excitedubai/strictly