Merge remote-tracking branch 'origin' into frontend

mergin frontend
added css for med-small screens
added more css
updating with master
finished small screen css
Merge pull request #61 from bobolinks-2014/css

created css medium and small views