Small changes
Trivial changes
Merge branch 'master' of https://github.com/csulb-cecs423-2014/examples

Conflicts:
	.gitignore