Merge branch 'master' of github.com:rocketu/group-project-base into brittney-feature
Set up Amazon S3 Storage for user images and comment attachments
created base login and registration pages.  Will need to change urls once proper workflow has been determined.  Please review Mike's edit account notes on base camp
Registered models in admin
Working on server configuration.  Just added new relic for monitoring
Updated comment model
Changed comment model and Attachment model foreign key reference.  Added application name variable to deploy.
Merge pull request #1 from brittkistner/features_brittney

Features brittney
Dropped database due to migration conflict.
Created tests for registration, comment model, user model
merge conflict for index.html
Merge branch 'garrett-branch' into develop
Working on the search feature styling.
Added attachment model and deleted initial migration due to conflict
Merge pull request #3 from brittkistner/garrett-branch

Working on the search feature styling.
added integration tests to complete
Created profile page and edit profile page.  Both require styling.
removed htmlcov directory
Changed edit profile template
Merge branch 'comments_brittney' into develop