added unformatted time to activity show
links open in external window via subclass or Redcarpet renderer
formatted date/time
Add start and end time in activity detail page
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 method to ApplicationHelper
fix the start and end time UI to be read only, and change its look
moved subclassed Redcarpet::Render::HTML to config/initialiers and added comments
Use view helper, and also fix gist link to be nicer, while we're here
Merge branch 'master' into feature/48-add-from-and-to-times-to-activities-show-page

Conflicts:
	app/views/activities/show.html.slim
Merge pull request #34 from lighthouse-labs/feature/48-add-from-and-to-times-to-activities-show-page

Add start and end time in activity detail page
Merge pull request #33 from lighthouse-labs/last_updated_timestamp

Last updated timestamp
Merge pull request #32 from lighthouse-labs/feature/62/external-links

links open in external window via subclass of Redcarpet renderer
updated gitignore
moved method into helper
merged with master
Mergneccessarye branch 'feature/55-custom-avatar-uploader' into feature/89-student-contact-wall
set nav bar dropdown and matching cohorts to each
add github link to students page