new feature file
new file
next commit
third
clean up comments
testing
add new file

commit 2235492fce007e9b66666b627aafb46ea7da1640
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:24:06 2013 -0700

    testing

commit c6f4a96a0f083bc49319d129e62c36074a2de969
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:13:10 2013 -0700

    clean up comments

commit 55c48d206b88801aea418b6beedc31d1cb6e3f8f
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:11:49 2013 -0700

    third

commit 20cebc57674d8e269d8bb419cfda5ae3cbac1edb
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:11:31 2013 -0700

    next commit

commit 83d5ccf99af56e71c643bb47bf36db2054953e88
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:11:06 2013 -0700

    new file

commit e298bb44cce1e5101959a2de573d126b7f3d8bce
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:08:31 2013 -0700

    new feature file
delete text
Squashed commit of the following:

commit 2235492fce007e9b66666b627aafb46ea7da1640
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:24:06 2013 -0700

    testing

commit c6f4a96a0f083bc49319d129e62c36074a2de969
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:13:10 2013 -0700

    clean up comments

commit 55c48d206b88801aea418b6beedc31d1cb6e3f8f
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:11:49 2013 -0700

    third

commit 20cebc57674d8e269d8bb419cfda5ae3cbac1edb
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:11:31 2013 -0700

    next commit

commit 83d5ccf99af56e71c643bb47bf36db2054953e88
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:11:06 2013 -0700

    new file

commit e298bb44cce1e5101959a2de573d126b7f3d8bce
Author: Eli Holmes <eli.holmes@noaa.gov>
Date:   Wed Jun 5 13:08:31 2013 -0700

    new feature file
test file
Merge branch 'develop'