moved repository to unforked repository
;
Merge pull request #1 from mlee284045/mike

moved repository to unforked repository
adding amazon s3 services details
Miguel: created basic registration and login pages
Merge pull request #2 from mlee284045/miguel

Miguel
Created two blank test files
merge commit
models
Merge pull request #3 from mlee284045/isabelle

models
changing main menu to index.html
Merge pull request #4 from mlee284045/miguel

changing main menu to index.html
updated base template
fixed merge issues
commit base template changes
merge commit
fixed merge conflict
merge
Merge pull request #5 from mlee284045/mike

Mike
adding changes after mikes disaster :) :) :)
Merge pull request #6 from mlee284045/miguel

adding changes after mikes disaster :) :) :)