first commit
hello world added
Merge branch 'master' of https://github.com/reistadjo/seniorproj

It's good...