initial savestate
Merge branch 'master' of https://github.com/kringon/webapp

Conflicts:
	.gitignore