Merge branch 'dev' into gh-pages
updated to 2014-04-06

updated to 2014-04-06
Merge pull request #3 from ChelseaStats/DEV

updated to 2014-04-06 …