Project Classes created (fixed)
Started implementing Views
Merge origin/master