Merge branch 'develop' of github.com:naturalblow/beach2013 into develop
updating Design to Beach Bums