created basic models and controllers
merge Jorge's changes