merge, moved tests around
-rw-r--r-- 243 .gitignore
drwxr-xr-x - package
-rw-r--r-- 72 welcome
drwxr-xr-x - www