Fixed bug with globals
Merge branch 'master' of github.com:lgarrison/chile2014-group3
Merge branch 'master' of github.com:lgarrison/chile2014-group3