fixed merge conflicts
fixed merge conflicts

EasyPeasyLemonSqueesy/backbone-issue-tracker,EasyPeasyLemonSqueesy/backbone-issue-tracker,DataBaseStuff/backbone-issue-tracker,DataBaseStuff/backbone-issue-tracker