first commit of the day
Merge branch 'master' of https://github.com/mark-ariniello/moodview
second commit
fixed merge conflicts
first push