commit with actual files
Merge branch 'master' of github.com:ffong/stockwatcher

Conflicts:
	README.md