Test branching out
Merge pull request #1 from SeoulTech/nick-test

Test merge branches