locations update Feb 1, 2014
Merge pull request #4 from vitamind/master

Update Branch