Moving name
Awesome Sandra's Script
Merge branch 'master' into RebeccaH
Merge branch 'master' into RebeccaH
name
Name
Merge remote-tracking branch 'origin' into RebeccaH
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
Delete nothing
Fixing my homework
JAD modified nothing.c
JAD modified nothing.c
Merge branch 'master' of https://github.com/karcaw/cpts224_2014
Updated nothing.c
Added my step to nothing. - Michael