2013 is the year, friends.
Merge branch 'master' of github.com:katyhuff/dissertation
Merge branch 'master' of github.com:katyhuff/dissertation
moved stuff around, should probably move it back.
moved stuff around, should probably move it back.
moved stuff around, should fix paths.
adds the right paths.
reorganization complete.