Starting search of Dice API
fixing has_secure_password
precompiling assets for Heroku
Changing structure for ease of heroku
fixed conflicts from merge (angela to master)
resolved conflicts from pull of master branch