- first commit to master
- next commit
Test for master
- adding index to master
- testing pushing to different branch
Merge branch 'beta'

Conflicts:
	index.html
Merge branch 'beta'

Conflicts:
	index.html
test