Controller generated, views started
Added all files for push
Fixed merge conflicts