Initial commit
Initial Commit
Updated README to reflect missing code standards file
Added the style guide to the framework
Adding my cmakes.
removed errant files from framework
Fixed a segfault in the code.
roll back from a previous update.
Added JSON Parser, Problem Object, and updated main and README to reflect this change
Made minor fixes to markdown on README
Updated README for link to adding collaborators
Made tiny changes to the README that no one but me will notice
added .gitignore so peoples repos aren't overflowing with .o files.
Attempting to troubleshoot
CMake changes
Merge remote-tracking branch 'upstream/master'
CMake changes to reflect the new project changes.
Updated Makefile to propagate changes to the executable name
Updated main so it would fail gracefully without enough arguments
Merge branch 'master' of https://github.com/brrcrites/CS220_Framework

Conflicts:
	Makefile