Merge pull request #1 from siegelhorn/master

Merging with master for V2
Merge pull request #2 from siegelhorn/master

Version 3-important dates, flipclock
Merge pull request #3 from siegelhorn/gh-pages

Merge from Master