Removed files
Add amazon
Deleted for security reasons
Add jquery masonry
Edit views because not working in heroku
clean up merges