Does this add a comment? Initial commit if yes.
Hello World
added devise member class
Added empty markdown file for github.
Added devise login widget to top of page
devise working for real real
Merge branch 'master' of https://github.com/FiercePunchStudios/FiercePunchClock

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/layouts/_member_widget.html.erb
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb
I have no idea whats going on
setting up users and employers