Added intellij .idea to .gitignore and the emacs temp file
Merge fixes
Merge branch 'master' of github.com:RyanDawkins/nails-pos into schedule
rewrote sort function for table rows and added indicator for reverse sort