testing git with multiple users
Testing Git
add Makefile, package_object.cpp class file
more comments, add project team members' names
add prof's code example (partial)
add stub for words2int hex to integer converter function
update .gitignore to ignore Mac OS X .DS_Store file
hello world
add hackpad to README
Merge branch 'develop' of https://github.com/tindrum/data_logger into develop
Update README.md
Add a thing to readme
add one line to readme
add teacher's example code (incomplete)
update .gitignore
Merge branch 'feature/Kevin' into feature/Daniel

Conflicts:
	.gitignore
edit README
edit README to conflict
edit README with Pink Floyd allusion
merged two versions of README