adds some style change
fixes merge conflicts
Modify rails_helper per directions from DBC challenge
Modify production database to serve static assets - (styling does not show in Heroku)
Change mail address to andrew's address
Merge branch 'master' of https://github.com/gopher-snakes-2014/shieldED into mailer_feature
adds ajax call in progress for admin page toggle.
Add s3 functionality to config/environment
Add AWS gem to gemfile
adds working dashboard toggle.
fixes to pass all spec tests
fixes merge conflicts
Add new process_login action/route in order to allow Students/Parents to login with 5 digit key
Add form for Parent/Student login
Alter user creations in seed file to allow testing for 5-digit key
Modify test syntax to account for login feature changes
Merge pull request #13 from gopher-snakes-2014/anders_view_report_stats

Anders view report stats
Merge branch 'master' of https://github.com/gopher-snakes-2014/shieldED into s3_&_5-Digit_key
Merge pull request #14 from gopher-snakes-2014/s3_&_5-Digit_key

S3 & 5 digit key
fix merge conflicts from master