updated planning
updated more basic changes
updated factories and test
renamed the factory files
renamed the factory files
fixed spacing in controller
updated more spacing
Merge branch 'develop' of github.com:brianllamar/chuych into develop