added json for makeups and images
edited .gitignore file
fixing merge conflicts
changed routes
Merge branch 'jsonreviews'

removed cached files from log/development
users can go back to user profile
users can go back to profile
Merge branch 'collections'
fixed log problem
Merge branch 'collections'
fixed logs problem
Merge pull request #13 from zelzel2315/collections

Collections
user first makeup is not repeating twice, collection list now working
Merge pull request #14 from zelzel2315/collections

user first makeup is not repeating twice, collection list now working
merging with a working collection list
fixing merge conflict