Fixed up some php with the database
Updated grunt config
Finished first draft of front page
Merge branch 'master' of github.com:ConnorHolyday/SellMyGadgets

Conflicts:
	library/Database.php