basic app working
Merge branch 'master' of github.com:reactor10/hacked2.1

Conflicts:
	app.go