pushing to heroku
	modified:   LifeTracker/settings.pyc
	modified:   activity/urls.pyc
	modified:   activity/views.py
	deleted:    activity/templates/activity_home.html
	modified:   requirements.txt
	deleted:    activity/templates/activity_home.html
	modified:   requirements.txt
	deleted:    activity/templates/activity_home.html
	deleted:    activity/templates/activity_home.html
	modified:   requirements.txt
	modified:   requirements.txt
	new file:   prod-requirements.txt
	modified:   requirements.txt
	modified:   LifeTracker/settings.py
	modified:   LifeTracker/settings.pyc
	new file:   activity/templates/activity_home.html
	modified:   activity/templates/base.html
	modified:   activity/urls.pyc
	modified:   activity/views.py
	modified:   activity/views.pyc
	deleted:    prod-requirements.txt
	modified:   LifeTracker/settings.py
	modified:   requirements.txt
	modified:   LifeTracker/settings.pyc
	new file:   LifeTracker/static/admin/css/base.css
	new file:   LifeTracker/static/admin/css/changelists.css
	new file:   LifeTracker/static/admin/css/dashboard.css
	new file:   LifeTracker/static/admin/css/forms.css
	new file:   LifeTracker/static/admin/css/ie.css
	new file:   LifeTracker/static/admin/css/login.css
	new file:   LifeTracker/static/admin/css/rtl.css
	new file:   LifeTracker/static/admin/css/widgets.css
	new file:   LifeTracker/static/admin/img/changelist-bg.gif
	new file:   LifeTracker/static/admin/img/changelist-bg_rtl.gif
	new file:   LifeTracker/static/admin/img/chooser-bg.gif
	new file:   LifeTracker/static/admin/img/chooser_stacked-bg.gif
	new file:   LifeTracker/static/admin/img/default-bg-reverse.gif
	new file:   LifeTracker/static/admin/img/default-bg.gif
	new file:   LifeTracker/static/admin/img/deleted-overlay.gif
	new file:   LifeTracker/static/admin/img/gis/move_vertex_off.png
	new file:   LifeTracker/static/admin/img/gis/move_vertex_on.png
	new file:   LifeTracker/static/admin/img/icon-no.gif
	new file:   LifeTracker/static/admin/img/icon-unknown.gif
	new file:   LifeTracker/static/admin/img/icon-yes.gif
	new file:   LifeTracker/static/admin/img/icon_addlink.gif
	new file:   LifeTracker/static/admin/img/icon_alert.gif
	new file:   LifeTracker/static/admin/img/icon_calendar.gif
	new file:   LifeTracker/static/admin/img/icon_changelink.gif
	new file:   LifeTracker/static/admin/img/icon_clock.gif
	new file:   LifeTracker/static/admin/img/icon_deletelink.gif
	new file:   LifeTracker/static/admin/img/icon_error.gif
	new file:   LifeTracker/static/admin/img/icon_searchbox.png
	new file:   LifeTracker/static/admin/img/icon_success.gif
	new file:   LifeTracker/static/admin/img/inline-delete-8bit.png
	new file:   LifeTracker/static/admin/img/inline-delete.png
	new file:   LifeTracker/static/admin/img/inline-restore-8bit.png
	new file:   LifeTracker/static/admin/img/inline-restore.png
	new file:   LifeTracker/static/admin/img/inline-splitter-bg.gif
	new file:   LifeTracker/static/admin/img/nav-bg-grabber.gif
	new file:   LifeTracker/static/admin/img/nav-bg-reverse.gif
	new file:   LifeTracker/static/admin/img/nav-bg-selected.gif
	new file:   LifeTracker/static/admin/img/nav-bg.gif
	new file:   LifeTracker/static/admin/img/selector-icons.gif
	new file:   LifeTracker/static/admin/img/selector-search.gif
	new file:   LifeTracker/static/admin/img/sorting-icons.gif
	new file:   LifeTracker/static/admin/img/tool-left.gif
	new file:   LifeTracker/static/admin/img/tool-left_over.gif
	new file:   LifeTracker/static/admin/img/tool-right.gif
	new file:   LifeTracker/static/admin/img/tool-right_over.gif
	new file:   LifeTracker/static/admin/img/tooltag-add.gif
	new file:   LifeTracker/static/admin/img/tooltag-add_over.gif
	new file:   LifeTracker/static/admin/img/tooltag-arrowright.gif
	new file:   LifeTracker/static/admin/img/tooltag-arrowright_over.gif
	new file:   LifeTracker/static/admin/js/LICENSE-JQUERY.txt
	new file:   LifeTracker/static/admin/js/SelectBox.js
	new file:   LifeTracker/static/admin/js/SelectFilter2.js
	new file:   LifeTracker/static/admin/js/actions.js
	new file:   LifeTracker/static/admin/js/actions.min.js
	new file:   LifeTracker/static/admin/js/admin/DateTimeShortcuts.js
	new file:   LifeTracker/static/admin/js/admin/RelatedObjectLookups.js
	new file:   LifeTracker/static/admin/js/calendar.js
	new file:   LifeTracker/static/admin/js/collapse.js
	new file:   LifeTracker/static/admin/js/collapse.min.js
	new file:   LifeTracker/static/admin/js/core.js
	new file:   LifeTracker/static/admin/js/inlines.js
	new file:   LifeTracker/static/admin/js/inlines.min.js
	new file:   LifeTracker/static/admin/js/jquery.init.js
	new file:   LifeTracker/static/admin/js/jquery.js
	new file:   LifeTracker/static/admin/js/jquery.min.js
	new file:   LifeTracker/static/admin/js/prepopulate.js
	new file:   LifeTracker/static/admin/js/prepopulate.min.js
	new file:   LifeTracker/static/admin/js/timeparse.js
	new file:   LifeTracker/static/admin/js/urlify.js
	new file:   LifeTracker/static/bootstrap/css/bootstrap-responsive.css
	new file:   LifeTracker/static/bootstrap/css/bootstrap-responsive.min.css
	new file:   LifeTracker/static/bootstrap/css/bootstrap.css
	new file:   LifeTracker/static/bootstrap/css/bootstrap.min.css
	new file:   LifeTracker/static/bootstrap/img/glyphicons-halflings-white.png
	new file:   LifeTracker/static/bootstrap/img/glyphicons-halflings.png
	new file:   LifeTracker/static/bootstrap/js/bootstrap.js
	new file:   LifeTracker/static/bootstrap/js/bootstrap.min.js
	new file:   LifeTracker/static/chartit/js/chartloader.js
	new file:   LifeTracker/static/css/.default.css.swp
	new file:   LifeTracker/static/css/bootstrap.min.css
	new file:   LifeTracker/static/css/default.css
	new file:   LifeTracker/static/css/reset.css
	new file:   LifeTracker/static/images/Economics 313 - Homework 20.pdf
	new file:   LifeTracker/static/images/clouds.jpg
	new file:   LifeTracker/static/images/green.png
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/.gitignore
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/README.textile
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-1.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-2.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-3.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-4.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/index.html
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-1.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-2.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-3.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-4.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/index.html
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-1.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-2.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-3.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-4.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/index.html
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/css/example.css
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/css/font-awesome.min.css
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/FontAwesome.otf
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.eot
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.svg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.ttf
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.woff
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-1.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-2.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-3.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-4.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/pagination.png
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/index.html
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/css/example.css
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/css/font-awesome.min.css
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/FontAwesome.otf
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.eot
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.svg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.ttf
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.woff
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/btns-next-prev.png
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-1.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-2.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-3.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-4.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/pagination.png
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/index.html
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/css/example.css
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/css/font-awesome.min.css
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/FontAwesome.otf
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.eot
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.svg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.ttf
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.woff
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-1.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-2.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-3.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-4.jpg
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/pagination.png
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/index.html
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/source/jquery.slides.coffee
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/source/jquery.slides.js
	new file:   LifeTracker/static/js/Slides-SlidesJS-3/source/jquery.slides.min.js
	new file:   LifeTracker/static/js/ajax.js
	new file:   LifeTracker/static/js/bootstrap.min.js
	new file:   LifeTracker/static/js/jquery-2.0.0.min.js
	new file:   LifeTracker/static/js/jquery.slides.coffee
	new file:   LifeTracker/static/js/jquery.slides.js
	new file:   LifeTracker/static/js/jquery.slides.min.js
	new file:   LifeTracker/static/js/my-slides-js.js
	modified:   LifeTracker/settings-heroku.py
	modified:   LifeTracker/settings.py
	modified:   LifeTracker/settings.pyc
	modified:   README.md
	modified:   requirements.txt
move static files to aws
	modified:   activity/templates/activity_about.html
	modified:   activity/templates/activity_home.html
	modified:   LifeTracker/settings-heroku.py
	modified:   LifeTracker/settings.py
	modified:   LifeTracker/settings.pyc
	modified:   LifeTracker/templates/accounts_home.html
	modified:   LifeTracker/urls.py
	modified:   LifeTracker/urls.pyc
	modified:   LifeTracker/views.py
	modified:   LifeTracker/views.pyc
	modified:   README.md
	modified:   activity/templates/activity_about.html
	modified:   activity/templates/base.html
	modified:   db.sqlite3
	new file:   heroku-logs.txt
	modified:   LifeTracker/settings.pyc
	new file:   LifeTracker/templates/404.html
	new file:   LifeTracker/templates/500.html
	renamed:    activity/templates/activity_about.html -> LifeTracker/templates/about.html
	modified:   LifeTracker/templates/accounts_home.html
	renamed:    activity/templates/activity_help.html -> LifeTracker/templates/help.html
	new file:   LifeTracker/templates/home.html
	modified:   LifeTracker/templates/invalid_login.html
	modified:   LifeTracker/templates/login.html
	modified:   LifeTracker/urls.py
	modified:   LifeTracker/urls.pyc
	modified:   LifeTracker/views.py
	modified:   LifeTracker/views.pyc
	modified:   README.md
	modified:   activity/forms.py
	modified:   activity/forms.pyc
	modified:   activity/templates/activityInstance_detail.html
	modified:   activity/templates/activity_detail.html
	modified:   activity/templates/activity_home.html
	modified:   activity/templates/base.html
	modified:   activity/urls.py
	modified:   activity/urls.pyc
	modified:   activity/views.py
	modified:   activity/views.pyc
	modified:   db.sqlite3
	modified:   LifeTracker/settings-local.py
	modified:   LifeTracker/settings.py
	modified:   LifeTracker/settings.pyc
	deleted:    LifeTracker/static/admin/css/base.css
	deleted:    LifeTracker/static/admin/css/changelists.css
	deleted:    LifeTracker/static/admin/css/dashboard.css
	deleted:    LifeTracker/static/admin/css/forms.css
	deleted:    LifeTracker/static/admin/css/ie.css
	deleted:    LifeTracker/static/admin/css/login.css
	deleted:    LifeTracker/static/admin/css/rtl.css
	deleted:    LifeTracker/static/admin/css/widgets.css
	deleted:    LifeTracker/static/admin/img/changelist-bg.gif
	deleted:    LifeTracker/static/admin/img/changelist-bg_rtl.gif
	deleted:    LifeTracker/static/admin/img/chooser-bg.gif
	deleted:    LifeTracker/static/admin/img/chooser_stacked-bg.gif
	deleted:    LifeTracker/static/admin/img/default-bg-reverse.gif
	deleted:    LifeTracker/static/admin/img/default-bg.gif
	deleted:    LifeTracker/static/admin/img/deleted-overlay.gif
	deleted:    LifeTracker/static/admin/img/gis/move_vertex_off.png
	deleted:    LifeTracker/static/admin/img/gis/move_vertex_on.png
	deleted:    LifeTracker/static/admin/img/icon-no.gif
	deleted:    LifeTracker/static/admin/img/icon-unknown.gif
	deleted:    LifeTracker/static/admin/img/icon-yes.gif
	deleted:    LifeTracker/static/admin/img/icon_addlink.gif
	deleted:    LifeTracker/static/admin/img/icon_alert.gif
	deleted:    LifeTracker/static/admin/img/icon_calendar.gif
	deleted:    LifeTracker/static/admin/img/icon_changelink.gif
	deleted:    LifeTracker/static/admin/img/icon_clock.gif
	deleted:    LifeTracker/static/admin/img/icon_deletelink.gif
	deleted:    LifeTracker/static/admin/img/icon_error.gif
	deleted:    LifeTracker/static/admin/img/icon_searchbox.png
	deleted:    LifeTracker/static/admin/img/icon_success.gif
	deleted:    LifeTracker/static/admin/img/inline-delete-8bit.png
	deleted:    LifeTracker/static/admin/img/inline-delete.png
	deleted:    LifeTracker/static/admin/img/inline-restore-8bit.png
	deleted:    LifeTracker/static/admin/img/inline-restore.png
	deleted:    LifeTracker/static/admin/img/inline-splitter-bg.gif
	deleted:    LifeTracker/static/admin/img/nav-bg-grabber.gif
	deleted:    LifeTracker/static/admin/img/nav-bg-reverse.gif
	deleted:    LifeTracker/static/admin/img/nav-bg-selected.gif
	deleted:    LifeTracker/static/admin/img/nav-bg.gif
	deleted:    LifeTracker/static/admin/img/selector-icons.gif
	deleted:    LifeTracker/static/admin/img/selector-search.gif
	deleted:    LifeTracker/static/admin/img/sorting-icons.gif
	deleted:    LifeTracker/static/admin/img/tool-left.gif
	deleted:    LifeTracker/static/admin/img/tool-left_over.gif
	deleted:    LifeTracker/static/admin/img/tool-right.gif
	deleted:    LifeTracker/static/admin/img/tool-right_over.gif
	deleted:    LifeTracker/static/admin/img/tooltag-add.gif
	deleted:    LifeTracker/static/admin/img/tooltag-add_over.gif
	deleted:    LifeTracker/static/admin/img/tooltag-arrowright.gif
	deleted:    LifeTracker/static/admin/img/tooltag-arrowright_over.gif
	deleted:    LifeTracker/static/admin/js/LICENSE-JQUERY.txt
	deleted:    LifeTracker/static/admin/js/SelectBox.js
	deleted:    LifeTracker/static/admin/js/SelectFilter2.js
	deleted:    LifeTracker/static/admin/js/actions.js
	deleted:    LifeTracker/static/admin/js/actions.min.js
	deleted:    LifeTracker/static/admin/js/admin/DateTimeShortcuts.js
	deleted:    LifeTracker/static/admin/js/admin/RelatedObjectLookups.js
	deleted:    LifeTracker/static/admin/js/calendar.js
	deleted:    LifeTracker/static/admin/js/collapse.js
	deleted:    LifeTracker/static/admin/js/collapse.min.js
	deleted:    LifeTracker/static/admin/js/core.js
	deleted:    LifeTracker/static/admin/js/inlines.js
	deleted:    LifeTracker/static/admin/js/inlines.min.js
	deleted:    LifeTracker/static/admin/js/jquery.init.js
	deleted:    LifeTracker/static/admin/js/jquery.js
	deleted:    LifeTracker/static/admin/js/jquery.min.js
	deleted:    LifeTracker/static/admin/js/prepopulate.js
	deleted:    LifeTracker/static/admin/js/prepopulate.min.js
	deleted:    LifeTracker/static/admin/js/timeparse.js
	deleted:    LifeTracker/static/admin/js/urlify.js
	deleted:    LifeTracker/static/bootstrap/css/bootstrap-responsive.css
	deleted:    LifeTracker/static/bootstrap/css/bootstrap-responsive.min.css
	deleted:    LifeTracker/static/bootstrap/css/bootstrap.css
	deleted:    LifeTracker/static/bootstrap/css/bootstrap.min.css
	deleted:    LifeTracker/static/bootstrap/img/glyphicons-halflings-white.png
	deleted:    LifeTracker/static/bootstrap/img/glyphicons-halflings.png
	deleted:    LifeTracker/static/bootstrap/js/bootstrap.js
	deleted:    LifeTracker/static/bootstrap/js/bootstrap.min.js
	deleted:    LifeTracker/static/chartit/js/chartloader.js
	deleted:    LifeTracker/static/css/.default.css.swp
	deleted:    LifeTracker/static/css/bootstrap.min.css
	deleted:    LifeTracker/static/css/default.css
	deleted:    LifeTracker/static/css/reset.css
	deleted:    LifeTracker/static/images/Economics 313 - Homework 20.pdf
	deleted:    LifeTracker/static/images/clouds.jpg
	deleted:    LifeTracker/static/images/green.png
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/.gitignore
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/README.textile
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-1.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-2.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-3.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/img/example-slide-4.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/index.html
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-fade/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-1.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-2.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-3.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/img/example-slide-4.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/index.html
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/basic-slide/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-1.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-2.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-3.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/img/example-slide-4.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/index.html
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/callbacks/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/css/example.css
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/css/font-awesome.min.css
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/FontAwesome.otf
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.eot
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.svg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.ttf
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/font/fontawesome-webfont.woff
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-1.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-2.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-3.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/example-slide-4.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/img/pagination.png
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/index.html
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/multiple/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/css/example.css
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/css/font-awesome.min.css
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/FontAwesome.otf
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.eot
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.svg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.ttf
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/font/fontawesome-webfont.woff
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/btns-next-prev.png
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-1.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-2.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-3.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/example-slide-4.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/img/pagination.png
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/index.html
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/playing/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/css/example.css
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/css/font-awesome.min.css
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/FontAwesome.otf
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.eot
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.svg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.ttf
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/font/fontawesome-webfont.woff
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-1.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-2.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-3.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/example-slide-4.jpg
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/img/pagination.png
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/index.html
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/examples/standard/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/source/jquery.slides.coffee
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/source/jquery.slides.js
	deleted:    LifeTracker/static/js/Slides-SlidesJS-3/source/jquery.slides.min.js
	deleted:    LifeTracker/static/js/ajax.js
	deleted:    LifeTracker/static/js/bootstrap.min.js
	deleted:    LifeTracker/static/js/jquery-2.0.0.min.js
	deleted:    LifeTracker/static/js/jquery.slides.coffee
	deleted:    LifeTracker/static/js/jquery.slides.js
	deleted:    LifeTracker/static/js/jquery.slides.min.js
	deleted:    LifeTracker/static/js/my-slides-js.js
	modified:   LifeTracker/urls.py
	modified:   LifeTracker/urls.pyc
	modified:   README.md
	modified:   activity/forms.py
	modified:   activity/forms.pyc
	modified:   activity/models.py
	modified:   activity/models.pyc
	modified:   activity/templates/activityInstance_detail.html
	modified:   activity/templates/activity_detail.html
	modified:   activity/templates/activity_list.html
	modified:   activity/templates/base.html
	modified:   activity/templates/form.html
	modified:   activity/templates/rateActivity_form.html
	modified:   activity/urls.pyc
	modified:   activity/views.py
	modified:   activity/views.pyc
	modified:   db.sqlite3
	modified:   static/css/default.css
	deleted:    static/css/reset.css
	new file:   static/css/styles.css