consolidating files

Bennett
Merge pull request #33 from spsuauv04/master

consolidating files