Current work on login/signup, JSON issue
Merge branch 'master' of github.com:puddi/ideasturm

Conflicts:
	js/script.js