Merge pull request #42 from BeerWithMe/staging

Staging
Merge pull request #45 from BeerWithMe/staging

Staging
adjust deploy settings
Merge pull request #46 from lpappone/master

adjust deploy settings
adjust deploy settings
Merge pull request #47 from lpappone/master

adjust deploy settings
adjust deploy settings
Merge pull request #48 from lpappone/master

adjust deploy settings
adjust deploy settings
Merge pull request #49 from lpappone/master

adjust deploy settings
Update deploy.sh
Update deploy.sh

Commenting out grunt for test
trying deploy with dev dependencies removed from package.json
Merge pull request #50 from lpappone/deploy

trying deploy with dev dependencies removed from package.json
add sass compiling to gruntfile tasks
added loading animation
fixed foam rising property of animation
changed our favicon, but prob won't show up unless your clear browsing data
Merge pull request #55 from liubolightning/staging

Staging
Merge pull request #53 from BeerWithMe/master

added loading animation