chaning find or create by error. MERGE IMMEDIATELY
Merge branch 'master' into testing_for_feature_merge
Merge pull request #57 from devdame/testing_for_feature_merge

Testing for feature merge