change key
Merge branch 'master' of heroku.com:simple-gallery

Conflicts:
	config/secrets.yml
Merge branch 'master' of https://github.com/weiyizheng/online_gallery
modified gitignore file