Edited schema.
Merge branch 'master' of heroku.com:lashoov
tools used image edit
Merge branch 'master' of heroku.com:lashoov
javascript attempt fix
Created lostpost and foundpost controllers and models + added their route files; Dropped location model; Created category and subcategory models; Modified views in welcome directory; Created match model; Modified post
Merge branch 'master' of heroku.com:lashoov
Created controllers for lostpost and foundpost.
Altered/added route files for views in welcome directory, as well as new
controllers.
Created models for lostpost, foundpost, category, subcategory, match

Conflicts:
	db/schema.rb
resolved merge conflicts