trying to merge stuff
adding sams files
some manual merging
indentation fixes
Merge pull request #8 from vaendryl/beta-2-Vaen

Beta 2 vaen