Made Changes Asked By GCI Task

[Ludwant]

I added myself, according to the Google Code-in Task.

[roonyh]

Hi thanks and welcome! There some unnecessary files named ".DS_Store" in the commit. Please remove those.

[Ludwant]

Hi, sorry for the .DS_STORE files. When I added my picture and edited index.html I used "git add -a" which included those files. I fixed it now, hope everything else is fine. Thank you!

[roonyh]

Great! Thanks! Now can you please rebase your work on the updated master branch? The code in our repo has changed since you made the pull request. This makes it harder to merge. Reading this should help: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

[Ludwant]

Alright, I rebased it. It should be good. Thanks again.

[roonyh]

Thanks! great job! just remove those unnecessary lines like "<<<<<<< HEAD" and "=======" You have done rebasing correctly except those lines are not needed and should be deleted.

And you can add a nice animation to your image with <div class="box-team wow bounceInDown" data-wow-delay="0.3s"> Checkout other images.

[Ludwant]

I added the delay and took out the unnecessary lines. Let me know if there is something else I need to do. Thank you for your help.

[roonyh]

Thanks :+1: ! you can check https://github.com/fossasia/fossasia.github.io/pull/110/files for changes you made. Can you please remove those unnecessary lines? and fix indentation where wrong. Thanks for your work and sorry for nit picking :smile:

[Ludwant]

Thats fine! Took out the /divs, and fixed some indentation. Sorry for those little errors. I'm guessing that with a community project, the code needs to be kept neat! Thanks again, hope everything else if okay.

[Ludwant]

Hello?

[namangoel1]

@Ludwant Merged, sorry for the delay!

[Ludwant]

Thank you so much!

[roonyh]

I am terribly sorry for not responding. I was offline for the last few days. Thanks @namangoel1 for attending to this :+1: @Ludwant I hope the task associated is closed?

[Ludwant]

That's fine! I ran out of time on the task, so I reclaimed it, but it is not closed on the GCI website.

[roonyh]

Will close it if you could give me a link.

[Ludwant]

The link to the task is this: http://www.google-melange.com/gci/task/view/google/gci2014/5803979057397760 Thanks for all your help!

[roonyh]

Please submit a link to this pull request as the work and mark the the task as complete.

[Ludwant]

I put the link up and marked it as complete.

[Ludwant]

Thank you!

[roonyh]

You are welcome!