Styling

Up to date with Master. I ran these;
$ git checkout master 
$ git fetch 
$ git merge origin/master
$ git checkout Styling 
$ git merge master

After I fixed a merge conflict, keeping the master version. 
Than ran $ rake db:drop db:create db:migrate db:seed
$ rails s
Everything is working great. It has the js form master and the maps from styling. Also the image uploading is auto sizing to 300 x 300.

Everything should work great.