selection page and ajax
add updates from dev branch
can now pass variables from controller to html to js for story images
assets added
Merge branch 'master' of https://github.com/hwigmore/three_pigs
background change
arc
arc again
fixed select images page
sign in modal
fix conflict in stories_controller
fixing buttons
Merge branch 'master' of https://github.com/hwigmore/three_pigs
changes
Merge branch 'master' of heroku.com:limitless-fortress-4934
sign in stuff
Merge branch 'master' of https://github.com/hwigmore/three_pigs
new relic yml file
new relic yml file
Merge branch 'master' of https://github.com/hwigmore/three_pigs

Conflicts:
	config/database.yml