Add DS_Store to .gitignore
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets
Add bootstrap 3 cdn
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets into front-end
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets into front-end

Conflicts:
	app/views/layouts/application.html.erb
removed bootstrap theme
Populate user#new html view
Edit user#new html view
Style users#new html view
Add style for general variables
Change application to SASS to use import so SASS functions will work.
Update view and styling for users#new.
What what! too many hackathons!
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets

Conflicts:
	.gitignore
	app/views/layouts/application.html.erb
Merge branch 'front-end'

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets