first commit
Merge https://github.com/aceveggie/hashanvik