Changed dir structure, and updated text and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app/styles/main.scss
i dont need this since it's generated with scss anyway