dev commit
moar dev commit
Merge pull request #12 from arit-ucsb/dev

dev commit
Merge pull request #13 from arit-ucsb/test

Merge Test into master