Add requirements
Add Procfile
Django 1.4.3 -> Django 1.5.1
Merge branch 'develop' of github.com:ToxicWar/reDoodle
Change requirements
Change requirements
Add static
Merge branch 'develop' of github.com:ToxicWar/reDoodle
Add requirements
Merge branch 'develop' of github.com:ToxicWar/reDoodle
Add media
Change .gitignore
Change requirements.txt
Merge branch 'develop' of github.com:ToxicWar/reDoodle

Conflicts:
	redoodle/templates/includes/like_dislike.html
Change deploy settings
Add DATABASE_URL
What the... he wants from me?
Merge branch 'master' of https://github.com/ToxicWar/reDoodle into try-make-auth-api