Added tile class
Merge origin/master
Added main class