Added ESD, hotfix for login redirection
added tracking exemption for heroku address
Added NCC outreach, adjusted awards
quick fix
added LoL starburst
Rename README.markdown to README.md
quick fix
added LoL starburst
Update README_Teacher.md
Updated TODOs
fixed joes logo in scrimmage
added fundly banner
Now all users can edit all blog posts
Revert "Now all users can edit all blog posts"

This reverts commit 1fd350cae95490c67bdc1554ab8e1339282888c9.
Revert 6c20159..9877429

This rolls back to commit 6c2015973a54b1325ac60afb2ea6780bfe3ad2e4.
Revert 1fd350c..4ade4dd

This rolls back to commit 1fd350cae95490c67bdc1554ab8e1339282888c9.
Fixed git mess-up, added fundly
Merge branch 'master' of heroku.com:minuteman-robotics

Conflicts:
	views/index.erb
Added new starburst, video, and SR awards
Added message for scouters