Scripts and stuff
Merge branch 'master' of https://github.com/aaronhallink/Instagrub

Conflicts:
	js/scripts.js
Removed changes for merge