added new muscle groups to images
merging
added new elements to exercise histories
fix sets in controller
add exp component to heat map function
Merge pull request #45 from krauzer/timer

Timer functionality and design
spockets conflict
spockets conflict
Merge pull request #46 from aedwards12/heat_map

added new muscle groups to exercise histories/ css/ js
create log in page layout
reroute home link to user profile
modify timer button to center, recolor, and repeat
home and user workout pages style
merging origin
resolve merge conflicts
Merge pull request #47 from red-spotted-newts-2014/css-styling

Css styling
does this fix things
for pull
Merge pull request #48 from red-spotted-newts-2014/css-styling

Css styling
setup calculating actual rest time with time variables