gitsgnore
Merge branch 'master' of https://github.com/KohoVolit/vaa2012-2