Commiting my changes, before pulling Josh's latest code.
Pulling Josh's latest code.
update gitignore, remove some files
add some files
add rest of updates
Add core makefile
update Makefile
update global Makefile to work at UMD
update Makefile again
update Makefile
Merging with Josh, post fix of MakeFiles
Modifications to Setup.csh
Merge pull request #1 from cranelli/ModifySetup

Modifications to Setup.csh
Resolved Issue with Merging
Merge pull request #3 from cranelli/master

Resolved Issue with Merging
Small changes
Test
Test2
Merges