merged login
merged login
made wells for buttnos in job_control and changed to container
merged tough views
merged Tony code
added some forms, some functionality
merged some backend stuff
added some styling changes
added toughdb to gitignore
Fixed ui for login and blocks
ported some stuff. maybe
merged with Terence code
Removed extra lines james forgot
nothing changed
added ajax for job_dir creation
added some stuff
merged with Terence code
saved
Added alertify to job creation page
Merge branch 'master' of https://bitbucket.org/twang95/tough-mockup