Committing all files
Merge pull request #1 from simon-kim/homework1

Committing all files
Adding travis yml
Merge pull request #2 from simon-kim/homework1

Adding travis yml
Forgot to install grunt-cli
Merge pull request #3 from simon-kim/homework1

Forgot to install grunt-cli
Adding button
Merge pull request #4 from simon-kim/master

Pulling
Merge pull request #5 from simon-kim/homework2

Merge pull request #4 from simon-kim/master
Yay for karma tests
Merge pull request #6 from simon-kim/homework2

Yay for karma tests
Updating travis.yml
Merge pull request #7 from simon-kim/homework2

Updating travis.yml
testing to see if this works
hmm
okay aborting random testing missions
Merge pull request #8 from simon-kim/homework2

Homework2
Merge pull request #9 from simon-kim/master

Pulling