remove generated files, update .gitignore
Merge remote-tracking branch 'josh/master'
Merge remote-tracking branch 'alana/master'
added station model