Kwadwo - removed video from all pages, should now only be on video page
Merge branch 'master' of github.com:kwadwon/crackit
Fix name change to default (show)
Kwadwo - add video, application, controllers
kwadwo - removed some files
Merge branch 'master' of github.com:kwadwon/crackit

Conflicts:
	crackit/config/routes.rb
kwadwo - updated ignore and config
Merge branch 'master' into kwadwo-video
resolve master
heroku test
heroku test2
Heroku test3
Merge branch 'master' of github.com:kwadwon/crackit
Merge branch 'master' of https://github.com/kwadwon/crackit
merge master