merge conflicts
merge confilct solves
updating activitys and boardview
merging view and models
updating activitys and boardview
Merge branch 'master' of https://github.com/agarsia/TicTac2
BoardView and BoardTouchListener implemented