Updated and merged changes

I'm gonna start trying to get my head around backbone js