initial commit
first change in code
3d change
hm swf changed again
swf changed againnn
hmmm
ignore in head
duplicated lines
view a
ignore swf branch
commit model in branch
Merge branch 'refs/heads/another_branch'

Conflicts:
	.gitignore
as properties
Merge branch 'master' of https://github.com/JeffWinder/GitTest

Conflicts:
	.gitignore