Garbage commit to be able to pull.
Committing Merge to master on Shell.java, there is some minor thing in UserDAO that gets added too.