added testfiles, and learned a bit about branching and staging
aaa
apparently i have to 'add' a file everytime i change it
i have to remember to commit after making changes but before pushing
Merge branch 'test_branch'
Merge branch 'github_branch'