Edit/create transactions, create events
Merge branch 'master' of https://github.com/zellahenderson/PennApps2013

Conflicts:
	src/main.py
Merge branch 'master' of https://github.com/zellahenderson/PennApps2013

Conflicts:
	src/main.py