make a conflict
junk
fixed conflict in makefile
Merge branch 'developer' of https://github.com/smartell/iSCAM into developer
Merge branch 'developer' of https://github.com/smartell/iSCAM into developer
Merge branch 'developer' of https://github.com/smartell/iSCAM into developer
keep changes to makefile