Merging with latest changes
Merge branch 'master' of github.com:rzhou186/dotheharlemshake

Conflicts:
	javascripts/app.js
Added alert for testing whether AJAX request goes through or not