Fixing conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	ece3849b14_lab3_jasoneklein_nwotero_lm3s2110/.cproject
	ece3849b14_lab3_jasoneklein_nwotero_lm3s2110/main.c