started doing some crazy shit random tweets
Merge branch 'master' of https://github.com/Prty/sadtweets

Conflicts:
	public/js/main.js