no message
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes

# By Warren Longmire
# Via Warren Longmire
* 'master' of https://github.com/okcomputer1982/dope_dukes:
  adds scrolling behavior.
  massive overhall of week_view prototype.

Conflicts:
	.DS_Store