styling refactoring for login
styling added to modal
styling refactored and ready to merge, beware views and css conflicts
merged dan's branch into master
Merge pull request #40 from red-admirals-2014/css-view-refactor

Css view refactor
Merging rails refactor with the master branch
mobile styling modified
Merging recent style update for mobile with master

Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright into css-view-refactor
Merge pull request #41 from red-admirals-2014/css-view-refactor

Css view refactor
added styling for old iphones
Merge pull request #42 from red-admirals-2014/css-view-refactor

added styling for old iphones
more formatting for stupid oldschool iphone
Merge pull request #44 from red-admirals-2014/css-view-refactor

more formatting for stupid oldschool iphone
modal fixed for phones
Merge pull request #45 from red-admirals-2014/css-view-refactor

modal fixed for phones
Merging JSON'S changes in with local master

Merge branch 'master' into refactor_js_and_rails
Merging Jason's branch locally.

Merge branch 'refactor_js_and_rails' of https://github.com/red-admirals-2014/Stage-Fright into refactor_js_and_rails