Initial import
Merge branch 'master' of git://github.com/jmar5439/konakart.git