Initial commit
Added a file
Updated from ProjectA
Merge pull request #1 from hansoln/fromProjectA

Updated from ProjectA
Edited from Super
Updated TestLibA from Super
Common change
Merge branch 'master' of github.com:hansoln/TestLibA

Conflicts:
	a.txt
Added new feature from Super
New commonly interesting feature
More commonly interesting festures
Added a new file
Added line to relatively new file
Added new file in library - From Super
apa ap

Signed-off-by: Jens Moser <Jens.Moser@nrk.no>
ompa
Not affecting subtree
More Not affecting subtree
Affecting subtree
Fixed merge conflict