fixed saves slider bug
precompiled assets
moved location of bxslider images
precompiled assets
changed locations for bxslider images
compiled assets
moving around stuff for heroku
precompiling assets
heroku stuff
removed merge conflict
moved image locations for asset pipeline
merging changes
Merge branch 'master' of github.com:dyep49/alex into development