Merge pull request #193 from uid/master

Pull .gitattributes file
Added div id bottom-buttons
Testing git push
Merge branch '6.MITx' of https://github.com/uid/caesar-web into 6.MITx
close 88
Merge pull request #195 from uid/master

Pulling Steven's bug fix from master to 6.MITx
added lines from master to comment.html
plz work
Slack days left show next to each assignment
added student tags to comments. still working on teacher and other tags, and finding out what role is the important one to use.'
close #88
reverted code back to how it was before I added all the useless garbage that did nothing.
Merge branch '6.MITx' of https://github.com/uid/caesar-web into 6.MITx

Conflicts:
	templates/dashboard/dashboard.html
Trying to resolve merge conflict
Merge branch '6.MITx' of https://github.com/uid/caesar-web into 6.MITx
Merge branch '6.MITx' of https://github.com/uid/caesar-web into 6.MITx
added changes to sitestatic, removed a comment in comment.html
plz
just updating
Please enter the commit message for your changes. Lines starting
Merge branch '6.MITx' of https://github.com/uid/caesar-web into 6.MITx