stashing files
stashing
merging
cleanup merges
added footer
updated footer
Merge branch 'master' of https://github.com/motivate/motivate.github.io