added new controller action and new erb
typo fix
resolved new and create line conflict
Merge branch 'development' of https://github.com/jasonleibowitz/meme_app into development