Merge pull request #29 from okcomputer1982/work/ash

Work/ash
fixes to weekview.
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes
adding content for week 2.
add attribute panel.
Merge branch 'master' of https://github.com/okcomputer1982/dope_dukes into work/ash

Conflicts:
	dev/.DS_Store
	dev/app/.DS_Store