Added file uploading and basic form views
Added file uploading and basic form views
Merge branch 'master' of github.com:GaleDragon/automaton