DONE MY LIST OF JOBS ( ͝° ͜ʖ͡°)
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/templates/project.html
Merge branch 'master' of https://github.com/notrodash/URL-Badmans--YRS-2014-