some initial scala solutions
Merge branch 'scala'
added *~ to gitignore
Merge branch 'scala'