recommit after change to file structure
Merge branch 'master' of https://github.com/BaxterStockman/OSU-CS

Conflicts:
	2013_Fall/cs261/homework/hw2/Makefile
	2013_Fall/cs261/homework/hw2/calc.c
	2013_Fall/cs261/homework/hw2/dynamicArray.c
	2013_Fall/cs261/homework/hw2/dynamicArray.h
	2013_Fall/cs261/homework/hw2/testDynArray.c