Merge pull request #3 from QUICC-FOR/dev_grid

Dev grid
Fix merging issue
Merge branch 'master' of github.com:SteveViss/C-STMFor
Fix merging issue
Quick modifs on grid_init
Minor change to select new state
Quick modifs
Minor changes to grid_cell
Merge branch 'master' into dev/gridcell

Conflicts:
	grid_cell.c
Added extern variable to header for choosing all possible states
Merge branch 'dev/gridcell'
Merge grid_init with grid functions
add set_uniform_grid
Merge branch 'master' of github.com:SteveViss/C-STMFor

Conflicts:
	test/grid_cell_test
Delete grid_init