resolves conflicts in rgblight.c

# Conflicts:
#	quantum/rgblight.c

updates README, fixes typo in new_project.sh

Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Honing in on an interval that works for me

adds freq LUT for future use

adds delayed vibrato

[Erez & Jack] Examples for advanced macro stuff

Merge pull request #282 from jasontwong/master

Add new keymap

adds revisions of .hex files for planck/preonic

removes old .hex files

updates default voice, prunes voices

addresses memory limits concerns for atomic default makefile

updates preonic default keymap

updates planck default keymap

Compiled Hex File

The keymap file to use without compilation.

updating personal atomic keymap (#285)

Merge pull request #280 from Twey/master

Add `quantum/keymap_extras/keymap_plover.h` and a keymap.

Add Twey's keymap

Update keymap image

Why:

* The transparency made it ugly.

This change addresses the need by:

* Make transparent parts white.

adds voice iteration to planck default