merge2
Merge branch 'master' of https://github.com/avoorhis/vamps_rails_app
Merge branch 'master' of https://github.com/avoorhis/vamps_rails_app
merge20130912
merge20130912
merge20130912
merge20130912_2
Merge branch 'master' of https://github.com/avoorhis/vamps_rails_app
new viz code
new viz code2