okie dokie let's do this dammit
Merge branch 'master' of https://github.com/rileychapman/project3

Conflicts:
	doublePen.m
	energy_val.asv
	energy_val.m
Merge branch 'master' of https://github.com/rileychapman/project3