adding my name file to master
jorge added to runme script
Starting the next homework assignment
Merge branch 'master' of github.com:karcaw/cpts224_2014
Merge pull request #2 from karcaw/nickbunn

adding my name file to master
adding my function to the nothing program
Homework 4
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
finally added my stuff
Merge branch 'master' into nickbunn

Conflicts:
	moving/runme
ignore bad mistakes
"Jackies changes"
Merge branch 'master' of https://github.com/karcaw/cpts224_2014
Merge branch 'master' of https://github.com/karcaw/cpts224_2014