changes to server
dev html added to dev
added giti
merged atlast