Initialized with older version
html.erb converted to haml, added haml support
Added gem 'quiet_assets'
Started 'career' page implementation
Merge branch 'master' of github.com:cybdoom/lits

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/admin.js
	app/assets/javascripts/application.js
	app/mailers/support_mailer.rb
	app/views/layouts/application.html.erb
	bin/bundle
	bin/cap
	bin/capify
	bin/erubis
	bin/rackup
	bin/rails
	bin/rake
	bin/rdoc
	bin/ri
	bin/sass
	bin/sass-convert
	bin/scss
	bin/sdoc
	bin/sdoc-merge
	bin/sprockets
	bin/thor
	bin/tilt
	bin/tt
	config/application.rb
	config/database.yml
	config/deploy.rb
	config/deploy/production.rb
	config/environments/production.rb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
	public/assets/manifest-ab079f225e175b0dc73d947252cff967.json
	public/images/video1_poster.jpg
	public/images/video2_poster.jpg
	public/images/video3_poster.jpg
	public/robots.txt
	public/sitemap.xml
	public/video/video1.mp4
	public/video/video1.webm
	public/video/video2.mp4
	public/video/video2.webm
	public/video/video3.mp4
	public/video/video3.webm
	test/fixtures/pages.yml
	test/fixtures/services.yml
Fixed last merge issues