jeremy's old changes
Merge branch 'master' of https://github.com/choi5983/seattle
fixed DAvid
killed the troll