deleted create.html.erb file
added flash error message to UsersController
altered js files for modal
deleted files committed
merged master changes
changed signup to regular page
fixed m conflicts
changed application.html.erb stylesheet hash convention
new signup page
new post page layout finished
added Tabs for Cinemagraph sorting functionality
linked to about page
added about page template
updated files
complete merge