Merge branch 'j'
added plan page
Merge branch 'j'
Merge branch 'master' of https://github.com/jordanabbasi/UnsocialNetwork