changed gitignore
new webapp
added some minor features
resolved conflicts