adding my function to the nothing program
Merge branch 'EricThomas'
"The Push!" By Steven Ahl
Changing the nothing file
fixing the nothing file
Merge https://github.com/karcaw/cpts224_2014

Conflicts:
	nothing.c
Merge https://github.com/karcaw/cpts224_2014

Conflicts:
	nothing.c
Fixed error - DanH