some stuff...
Merge branch 'master' of https://github.com/amfelds/dropboxapiapp

Conflicts:
	dropboxapiapp/home.html