.vstags stupied tags.

diff --cc .gitignore
index 178b7d0f782f7b4ba8bcedbdc12c9a1ad768f333,394529c6435ad159c6ff02fa259b970145ba51c8..9ecce3fdf3e0b038e194ae795df4f6a2a94fc374
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,42 +1,46 @@@
++<<<<<<< HEAD
 +.vstags
++=======
+ log/thttpd.log
+ thttpd-2.29/
+ thttpd-2.29/*
+ startDevWebServer.sh
+ thttpd.conf
+ # Compiled source #
+ ###################
+ *.com
+ *.class
+ *.dll
+ *.exe
+ *.o
+ *.so
+ 
+ # Packages #
+ ############
+ # it's better to unpack these files and commit the raw source
+ # git has its own built in compression methods
+ *.7z
+ *.dmg
+ *.gz
+ *.iso
+ *.jar
+ *.rar
+ *.tar
+ *.zip
+ 
+ # Logs and databases #
+ ######################
+ *.log
+ *.sql
+ *.sqlite
+ 
+ # OS generated files and db#
+ ######################
+ .DS_Store
+ .DS_Store?
+ ._*
+ .Spotlight-V100
+ .Trashes
+ *.db
+ *.swp
++>>>>>>> 2f96ef1981c27f555a577675e0f4196571432b53