clearing
cleared
converted to basic ember
updated to bootstrap 2.3.1 and affixed tooltable
subl project
going to check master
workspace updated
updated to spring 2014
Merge branch 'ember'

* ember:
  updated to spring 2014
  workspace updated
  going to check master
  subl project
  updated to bootstrap 2.3.1 and affixed tooltable
  converted to basic ember
  cleared
  clearing

Conflicts:
	_css/semanticcss.css
	index.html
	resumebuilder.sublime-workspace