Slider and sub slider

Slider and sub slider added
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
Merge branch 'master' of https://github.com/lawitherow/hackathon2014