Fix conflicts

I added the following issue.

Fix typo and bootstrap class in view. (by udzura)
https://github.com/udzura/doitnow/blob/master/views/index.haml

Thank you for fix to typo.