adding file5 to repo
awesome stuff in file2
Merge branch 'master' of github.com:jknightihiji/testrepo into branch2

Conflicts:
	file2
Merge pull request #3 from jknightihiji/branch2

Added file5 and modified file2 after merging from master