updated styles
updated paths
Merge branch 'master' of https://github.com/mrienstra/upped

Conflicts:
	src/script/app.jsx
moving paths