commit
resolved conflict
minor adjustments
Merge branch 'master' of https://github.com/poppedBubble/poppedBubble.com
added animated scrolling