working migrations and everything working #235
resolved conflicts #235
Merge pull request #314 from yousraHazem/c2_ss

working migrations and everything working #235
merging master again