Merge branch 'master' of https://github.com/Jtupiter/anGo

Conflicts:
	web/css/scss/style.scss
	web/css/style.css
	web/index.html
Fixed conflicts - Removed Everything