Added link to Gist
Uncommented update_instructions_from_gist, which was modified to seed our test db. Ommitted from last commit
created survey model
activity survey working
Implements display of teacher notes in activity view
model next and previous methods done
added favicon
css styling of buttons
styled more. finished project
Merge branch 'feature/80-teacher-specific-notes-for-activities' of https://github.com/lighthouse-labs/laser_shark into feature/80-teacher-specific-notes-for-activities
fixed hardcoded admin password
Merge pull request #41 from lighthouse-labs/bug-fix/admin-password-env

fixed hardcoded admin password
Merge branch 'master' into feature/previous-next-activity-details

Conflicts:
	app/views/activities/show.html.slim
Merge pull request #40 from lighthouse-labs/feature/previous-next-activity-details

Feature/previous next activity details
Merge pull request #31 from lighthouse-labs/feature/50-gist-button

Feature/50 gist button
Merge pull request #35 from lighthouse-labs/add_survey_model

Add survey model and view partial
minor improvement to how cohort is loaded for teacher from session
Merge branch 'master' of github.com:lighthouse-labs/laser_shark
Merge branch 'master' into feature/62/external-links

Updating to master no changes in branch
A
A
A
A
B
B
B
B
B
B
B

B
A
A
A
A
the commit.
moved subclassed Redcarpet::Render::HTML to config/initialiers and added comments