added images to happy folder
deleted files
Merge branch 'master' of https://github.com/nyhunter77/emotions

Conflicts:
	app/assets/stylesheets/main.scss
delete photo files
delete photo files
delete photo files
added helper method for return images on happy and sad
merge conflict resolve
render correct view for show page
merge conflict resolved