test1
test1
init
init
init
client side for full job table
server side jeson, string parser for full time
server side jeson, string parser for full time
server side jeson, string parser for full time
lost files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	app/controllers/users_controller.rb
	app/views/users/show.html.erb