add waffle.io badge
Merge pull request #34 from waffle-iron/master

waffle.io Badge
Merge pull request #33 from lukeaiken/map_2

Map 2
move javascript libraries out of app folder
rvmrc
move files back
merged in master