Merge pull request #234 from BU-CS673/production

Production back into my working branch!
Merge pull request #245 from BU-CS673/production

Production back into my working branch!
Parser Updates

Parser no longer allows roads to be parsed in under stationary elements.
Instead the Parser changes the terrain to grass.
Added curly braces to if statement

Code standards fix!
Resolved merge conflicts with Production
Merge pull request #275 from BU-CS673/Brandon

Brandon -> Production
Merge pull request #283 from BU-CS673/production

Production -> Canfield