added VHA as contributor

2013-11-26 22:59:21 -06:00
parent 871ab6020a 826da5317d
commit aad3d685c3
1 changed files with 3 additions and 0 deletions
--- a/README.adoc
+++ b/README.adoc
@@ -45,7 +45,10 @@ companies and individuals:

 * http://www.prowaveconsulting.com[Prowave Consulting]
 * http://www.scispike.com[SciSpike]
+<<<<<<< HEAD
 * http://www.vha.com[VHA]
+=======
+>>>>>>> 826da5317d6312d09071d1184d74327a6fae6e93
 * Alexander Shvid

 The following companies and individuals are also generously providing